]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Wanda: remove unnecessary destroy signal connection
authorGiovanni Campagna <gcampagna@src.gnome.org>
Mon, 17 Sep 2012 14:20:58 +0000 (16:20 +0200)
committerGiovanni Campagna <gcampagna@src.gnome.org>
Mon, 17 Sep 2012 17:49:58 +0000 (19:49 +0200)
'destroy' is emitted before the actor is unmapped during destruction, so
notify::mapped would emit an exception. Since unmapping is guaranteed,
the 'destroy' signal is unnecessary.

https://bugzilla.gnome.org/show_bug.cgi?id=684154

js/ui/wanda.js

index 378c7ad50b75ce67b1fc593a618a07a324082852..9850ebc9da01a96bdb3334c93c5d95db74ef7073 100644 (file)
@@ -50,21 +50,12 @@ const WandaIcon = new Lang.Class({
     },
 
     createIcon: function(iconSize) {
-        if (this._animations)
-            this._animations.destroy();
-
         if (!this._imageFile) {
             return new St.Icon({ icon_name: 'face-smile',
                                  icon_size: iconSize });
         }
 
         this._animations = St.TextureCache.get_default().load_sliced_image(this._imageFile, this._imgWidth, this._imgHeight);
-        this._animations.connect('destroy', Lang.bind(this, function() {
-            if (this._timeoutId)
-                GLib.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-            this._animations = null;
-        }));
         this._animations.connect('notify::mapped', Lang.bind(this, function() {
             if (this._animations.mapped && !this._timeoutId) {
                 this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FISH_SPEED, Lang.bind(this, this._update));